Skip to content

Sync #6ca6619f #1100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

Sync #6ca6619f #1100

wants to merge 21 commits into from

Conversation

wxsms
Copy link
Member

@wxsms wxsms commented Aug 4, 2025

Description of Problem

vuejs/docs@7d7d50e...6ca6619

azzumed and others added 20 commits May 28, 2025 10:42
…nent (#3240)

Add Scrimba component and links
register ScrimbaLink component and change color on play button
Bumps [vue](https://github.com/vuejs/core) from 3.5.13 to 3.5.16.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.5.13...v3.5.16)

---
updated-dependencies:
- dependency-name: vue
  dependency-version: 3.5.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…se (#3231)

docs(animation): add note about Number.MAX_SAFE_INTEGER for large input edge case
* feat: enhance code block & code group

* chore: fix line number

* chore: duplicate code line
Bumps [@vue/repl](https://github.com/vuejs/repl) from 4.5.1 to 4.6.1.
- [Release notes](https://github.com/vuejs/repl/releases)
- [Changelog](https://github.com/vuejs/repl/blob/main/CHANGELOG.md)
- [Commits](vuejs/repl@v4.5.1...v4.6.1)

---
updated-dependencies:
- dependency-name: "@vue/repl"
  dependency-version: 4.6.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [vue](https://github.com/vuejs/core) from 3.5.16 to 3.5.17.
- [Release notes](https://github.com/vuejs/core/releases)
- [Changelog](https://github.com/vuejs/core/blob/main/CHANGELOG.md)
- [Commits](vuejs/core@v3.5.16...v3.5.17)

---
updated-dependencies:
- dependency-name: vue
  dependency-version: 3.5.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
* docs: add addendum on useId usage with computed

* docs: refine useId warning with computed
Bumps [@vue/repl](https://github.com/vuejs/repl) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/vuejs/repl/releases)
- [Changelog](https://github.com/vuejs/repl/blob/main/CHANGELOG.md)
- [Commits](vuejs/repl@v4.6.1...v4.6.2)

---
updated-dependencies:
- dependency-name: "@vue/repl"
  dependency-version: 4.6.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
# Conflicts:
#	.vitepress/inlined-scripts/restorePreference.js
#	.vitepress/theme/components/Banner.vue
#	.vitepress/theme/index.ts
#	pnpm-lock.yaml
#	src/api/composition-api-helpers.md
#	src/api/composition-api-lifecycle.md
#	src/api/sfc-script-setup.md
#	src/guide/built-ins/suspense.md
#	src/guide/components/v-model.md
#	src/guide/essentials/component-basics.md
#	src/guide/essentials/computed.md
#	src/guide/essentials/forms.md
#	src/guide/essentials/template-syntax.md
#	src/guide/extras/animation.md
#	src/guide/extras/web-components.md
#	src/guide/quick-start.md
#	src/guide/scaling-up/ssr.md
#	src/guide/typescript/composition-api.md
#	src/style-guide/rules-recommended.md
@wxsms wxsms added 从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录 labels Aug 4, 2025
Copy link

vercel bot commented Aug 4, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
docs-zh-cn ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 4, 2025 6:41am

Copy link

cloudflare-workers-and-pages bot commented Aug 4, 2025

Deploying docs-zh-cn with  Cloudflare Pages  Cloudflare Pages

Latest commit: ae464cf
Status: ✅  Deploy successful!
Preview URL: https://ba8078da.docs-zh-cn.pages.dev
Branch Preview URL: https://sync.docs-zh-cn.pages.dev

View logs

Comment on lines +3 to +6
<ScrimbaLink href="https://scrimba.com/links/vue-component-v-model" title="Free Vue.js Component v-model Lesson" type="scrimba">
观看Scrimba的互动视频课程
</ScrimbaLink>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<ScrimbaLink href="https://scrimba.com/links/vue-component-v-model" title="Free Vue.js Component v-model Lesson" type="scrimba">
观看Scrimba的互动视频课程
</ScrimbaLink>
<ScrimbaLink href="https://scrimba.com/links/vue-component-v-model" title="Free Vue.js Component v-model Lesson" type="scrimba">
观看 Scrimba 的互动视频课程
</ScrimbaLink>

<style>/* ... */</style>
```

</div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Jinjiang 风格指南部分,现在是并入 cn 站点还是暂时屏蔽呀,#1070 是临时移除的。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

在 style-guide 有全新版本之前建议不要做任何同步了,据我了解团队暂时没有任何这方面的计划

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
从英文版同步 请使用 merge commit 合并 从 upstream 同步的 PR 需保留 git 历史记录
Projects
None yet
Development

Successfully merging this pull request may close these issues.